--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Commit 5d586d26fcf6cf1e419337a91c705457e85b78e1
Parents : ff58028
Author : Mark Qvist <mark@unsigned.io>
Date : 2024-09-07T11:30:19+02:00
Implemented outbound stamp cost handling and stamp cost display in object details
Changes
3 files changed, 36 insertions(+), 1 deletions(-)
Diff
diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
index e0026f90..40ca65c7 100644
--- a/sbapp/sideband/core.py
+++ b/sbapp/sideband/core.py
@@ -379,6 +379,8 @@ class SidebandCore():
self.config["lxmf_periodic_sync"] = False
self.config["lxmf_ignore_unknown"] = False
self.config["lxmf_sync_interval"] = 43200
+ self.config["lxmf_require_stamps"] = False
+ self.config["lxmf_inbound_stamp_cost"] = None
self.config["last_lxmf_propagation_node"] = None
self.config["nn_home_node"] = None
self.config["print_command"] = "lp"
@@ -505,6 +507,10 @@ class SidebandCore():
self.config["lxmf_sync_interval"] = 43200
if not "lxmf_try_propagation_on_fail" in self.config:
self.config["lxmf_try_propagation_on_fail"] = True
+ if not "lxmf_require_stamps" in self.config:
+ self.config["lxmf_require_stamps"] = False
+ if not "lxmf_inbound_stamp_cost" in self.config:
+ self.config["lxmf_inbound_stamp_cost"] = None
if not "notifications_on" in self.config:
self.config["notifications_on"] = True
if not "print_command" in self.config:
@@ -2664,7 +2670,11 @@ class SidebandCore():
def lxmf_announce(self, attached_interface=None):
if self.is_standalone or self.is_service:
- self.lxmf_destination.announce(attached_interface=attached_interface)
+ if self.config["lxmf_require_stamps"]:
+ self.message_router.set_inbound_stamp_cost(self.lxmf_destination, self.config["lxmf_inbound_stamp_cost"])
+ self.message_router.announce(self.lxmf_destination.hash, attached_interface=attached_interface)
+ else:
+ self.lxmf_destination.announce(attached_interface=attached_interface)
self.last_lxmf_announce = time.time()
self.next_auto_announce = time.time() + 60*(random.random()*(SidebandCore.AUTO_ANNOUNCE_RANDOM_MAX-SidebandCore.AUTO_ANNOUNCE_RANDOM_MIN)+SidebandCore.AUTO_ANNOUNCE_RANDOM_MIN)
RNS.log("Next auto announce in "+RNS.prettytime(self.next_auto_announce-time.time()), RNS.LOG_DEBUG)
@@ -3727,6 +3737,13 @@ class SidebandCore():
RNS.log("An error occurred while getting message transfer progress: "+str(e), RNS.LOG_ERROR)
return None
+ def get_lxm_stamp_cost(self, lxm_hash):
+ try:
+ return self.message_router.get_outbound_lxm_stamp_cost(lxm_hash)
+ except Exception as e:
+ RNS.log("An error occurred while getting message transfer stamp cost: "+str(e), RNS.LOG_ERROR)
+ return None
+
def send_message(self, content, destination_hash, propagation, skip_fields=False, no_display=False, attachment = None, image = None, audio = None):
try:
if content == "":
@@ -3754,6 +3771,9 @@ class SidebandCore():
fields[LXMF.FIELD_AUDIO] = audio
lxm = LXMF.LXMessage(dest, source, content, title="", desired_method=desired_method, fields = fields)
+
+ # Defer stamp generation so workload doesn't run on UI thread
+ lxm.defer_stamp = True
if not no_display:
lxm.register_delivery_callback(self.message_notification)
diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py
index ef8f1b71..e0cb0961 100644
--- a/sbapp/ui/messages.py
+++ b/sbapp/ui/messages.py
@@ -158,6 +158,13 @@ class Messages():
if prg != None:
prgstr = ", "+str(round(prg*100, 1))+"% done"
if prg <= 0.00:
+ stamp_cost = self.app.sideband.get_lxm_stamp_cost(msg["hash"])
+ if stamp_cost:
+ sphrase = f"Generating stamp (cost {stamp_cost})"
+ prgstr = ""
+ else:
+ sphrase = "Waiting for path"
+ elif prg <= 0.01:
sphrase = "Waiting for path"
elif prg <= 0.03:
sphrase = "Establishing link"
diff --git a/sbapp/ui/objectdetails.py b/sbapp/ui/objectdetails.py
index 6d84da48..0dd1255e 100644
--- a/sbapp/ui/objectdetails.py
+++ b/sbapp/ui/objectdetails.py
@@ -805,6 +805,14 @@ class RVDetails(MDRecycleView):
except Exception as e:
RNS.trace_exception(e)
+ try:
+ stamp_cost = self.delegate.app.sideband.message_router.get_outbound_stamp_cost(self.delegate.object_hash)
+ if stamp_cost:
+ self.entries.append({"icon": "postage-stamp", "text": f"Required stamp cost [b]{stamp_cost}[/b]", "on_release": pass_job})
+
+ except Exception as e:
+ RNS.trace_exception(e)
+
if len(self.entries) == 0:
self.entries.append({"icon": "timeline-question-outline", "text": f"No telemetry available for this device"})
──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────